Auto merge of #1754 - tshepang:patch-1, r=steveklabnik
authorbors <bors@rust-lang.org>
Fri, 26 Jun 2015 18:32:35 +0000 (18:32 +0000)
committerbors <bors@rust-lang.org>
Fri, 26 Jun 2015 18:32:35 +0000 (18:32 +0000)
commit0b6db0a055a212033aaf34c22a4d868aad264b5b
tree964d93146a4bf830039272c006f7fd3a5a06c68e
parentb030d35d5cf6b35bf8a6bfd218ab4df9d6a86361
parente0280a4db472473ca5e7b49bb778260349fc1654
Auto merge of #1754 - tshepang:patch-1, r=steveklabnik